Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses client / .DS_Store
diff --git a/ruralHouses client/.DS_Store b/ruralHouses client/.DS_Store
new file mode 100644 (file)
index 0000000..4eec472
Binary files /dev/null and b/ruralHouses client/.DS_Store differ